pull: Support full recursive mirrors of repositories with summary file

Now that we have a summary file, we can use it to allow a simple:

ostree pull --mirror

To download the latest commit on every branch.  Also, for a case I'm
dealing with there's only one branch, but I don't want mirror users to
have to hardcode it.

https://bugzilla.gnome.org/show_bug.cgi?id=737807

diff --git a/Makefile-tests.am b/Makefile-tests.am
index fd0d720893d4a371d094ce9acdebba7e99d19027..6878a30ca135b337562464f99f7e2149f02ceede 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -31,6 +31,7 @@ testfiles = test-basic \
        test-libarchive \
        test-pull-archive-z \
        test-pull-corruption \
+       test-pull-mirror-summary \
        test-pull-large-metadata \
        test-pull-metalink \
        test-pull-resume \

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index e89e72326692f4bbb6d16c1b87943125c84d8399..78237d97ca9b6fb59159fbd09a346786355dbd05 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1185,6 +1185,7 @@ process_one_static_delta_meta (OtPullData   *pull_data,
 {
 }
 
+/* documented in ostree-repo.c */
 gboolean
 ostree_repo_pull (OstreeRepo               *self,
                   const char               *remote_name,
@@ -1231,6 +1232,7 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
   GKeyFile *config = NULL;
   GKeyFile *remote_config = NULL;
   char **configured_branches = NULL;
+  gboolean is_mirror = (flags & OSTREE_REPO_PULL_FLAGS_MIRROR) > 0;
   guint64 bytes_transferred;
   guint64 end_time;
 
@@ -1288,6 +1290,8 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
 
   pull_data->fetcher = _ostree_fetcher_new (pull_data->repo->tmp_dir,
                                            fetcher_flags);
+  requested_refs_to_fetch = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+  commits_to_fetch = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
   {
     gs_free char *tls_client_cert_path = NULL;
@@ -1404,6 +1408,8 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
         goto out;
     }
 
+  configured_branches = g_key_file_get_string_list (config, remote_key, "branches", NULL, NULL);
+
   if (!load_remote_repo_config (pull_data, &remote_config, cancellable, error))
     goto out;
 
@@ -1424,10 +1430,47 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
 
   pull_data->static_delta_metas = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref);
 
-  requested_refs_to_fetch = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-  commits_to_fetch = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  if (is_mirror && !refs_to_fetch && !configured_branches)
+    {
+      SoupURI *summary_uri = NULL;
+      gs_unref_bytes GBytes *bytes = NULL;
+      gs_free char *ret_contents = NULL;
+      
+      summary_uri = suburi_new (pull_data->base_uri, "summary", NULL);
+      if (!fetch_uri_contents_membuf_sync (pull_data, summary_uri, FALSE, TRUE,
+                                           &bytes, cancellable, error))
+        goto out;
+      soup_uri_free (summary_uri);
+      
+      if (bytes)
+        {
+          gs_unref_variant GVariant *refs = NULL;
+          gsize i, n;
+
+          pull_data->summary = g_variant_new_from_bytes (OSTREE_SUMMARY_GVARIANT_FORMAT, bytes, FALSE);
+          refs = g_variant_get_child_value (pull_data->summary, 0);
+          n = g_variant_n_children (refs);
+          for (i = 0; i < n; i++)
+            {
+              const char *refname;
+              gs_unref_variant GVariant *ref = g_variant_get_child_value (refs, i);
+
+              g_variant_get_child (ref, 0, "&s", &refname);
 
-  if (refs_to_fetch != NULL)
+              if (!ostree_validate_rev (refname, error))
+                goto out;
+              
+              g_hash_table_insert (requested_refs_to_fetch, g_strdup (refname), NULL);
+            }
+        }
+      else
+        {
+          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                       "Fetching all refs was requested in mirror mode, but remote repository does not have a summary");
+          goto out;
+        }
+    } 
+  else if (refs_to_fetch != NULL)
     {
       char **strviter;
       for (strviter = refs_to_fetch; *strviter; strviter++)
@@ -1449,7 +1492,6 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
     {
       char **branches_iter;
 
-      configured_branches = g_key_file_get_string_list (config, remote_key, "branches", NULL, NULL);
       branches_iter = configured_branches;
 
       if (!(branches_iter && *branches_iter))
@@ -1558,7 +1600,6 @@ ostree_repo_pull_one_dir (OstreeRepo               *self,
         }
       else
         {
-          gboolean is_mirror = (pull_data->flags & OSTREE_REPO_PULL_FLAGS_MIRROR) > 0;
           ostree_repo_transaction_set_ref (pull_data->repo, is_mirror ? NULL : pull_data->remote_name, ref, checksum);
         }
     }

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 0d24a9674f705af2ff05a83fafffa018b2f8c241..c70664090fb88de68ddc28de7e76b1ed3ea6688f 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2045,6 +2045,15 @@ ostree_repo_read_commit (OstreeRepo   *self,
  * refs @refs_to_fetch.  For each ref that is changed, download the
  * commit, all metadata, and all content objects, storing them safely
  * on disk in @self.
+ *
+ * If @flags contains %OSTREE_REPO_PULL_FLAGS_MIRROR, and
+ * the @refs_to_fetch is %NULL, and the remote repository contains a
+ * summary file, then all refs will be fetched.
+ *
+ * Warning: This API will iterate the thread default main context,
+ * which is a bug, but kept for compatibility reasons.  If you want to
+ * avoid this, use g_main_context_push_thread_default() to push a new
+ * one around this call.
  */
 gboolean
 ostree_repo_pull (OstreeRepo               *self,